removed some compilation errors