Fixing several bugs on 5.14.x

See commits for further details...