Checkpoint - Assorted cleanup and tweaks