bugger, more fixes (should have tested fully locally first)