Adding some changes to allow the compilation