Fixes (nearly done!)