Fix issues while building in some systems
Fix warnings
Fix warnings