fixes to 4.2 / 4.3 support (cover both