Removed compile errors in typecasting
Merge branch 'linuxCompileErrors' into develop