Merge "Fix minor issues found with phan"