fix compass import
Merge branch 'Adar'