Dipatch: Mantis issues fixed