Merge "Fix misc phan errors by adjusting documentation (#8)"