few file changes for compilation