Fixed a few compilation error from other compilers after last push to repository