Update to 5.6.19 plus minor tweaks