Removed some compilation errors