Small changes for compilation