import fixes for 1.4