fixes to be 1.4 friendly