Moar fixes to be have