Fixed more 1.7 related bugs