merlin fixes