! backport a few more fixes to 1.4.5