Mantis #74
Some fixes