Merge "Fix/suppress misc phan errors (#2)"