GEP-6 Additional bug fixes for 4.4