Make changes for compilation