Default goal tweaks again