New fixes for The Great Work