Improvements to 4.4 compatibility - rough but working