fixes for aggressive compilation errors