Maintain orientation fixes and checkpoints