Fixing several bugs on 5.15.x

See commit details for further information...