Problems with 1.6 imports fixed