Fix type issues found by new compiler.