Fixing up the check in / check out stuff