Additional changes to get rid of compilation warnings