Fixed a few import errors
Checkpoint