Fixing up buildcheckpoints