Fixing 3 minor bugs

See commit comments for further information

First commit could be reported on 5.14.x.