Updates to deal with project checkout issues