Removal of compilation warnings