More fixes to get everything running properly again after #27