That might be what I need to do as well.When I first got my Teric both the battery and compass had the problems you describe. I'd have to constantly recalibrate the compass and then it would be out of whack a few dives later. After the service both compass and battery have been fine. I've not had to recalibrate the compass in a year.