Clear up some compilation errors