Compass fixes