Compilation warnings clean up