Checkpointing and POS fixes