More fixes for 4.2.x core version.