more goblin fixes