moar build fixes