Dispatch: Mantis fixes added.