Fix handlers after testing with LTLMoP.