Grotto fixes