Compass and helper fixes