Fixes #459
Minerva typo
Nother fix in the same bit
Merge remote-tracking branch 'upstream/master'