Fix typeErrors
Merge branch 'r1411'