Minor tweaks before 4.3 relase.