Build fixes math r65