Goombasav fixes