Fixing up compass integration that looked correct but wasn't