fix some compilation errors/warnings