Basic continuity checks/fixes