Moar ChaOS build fixes