Minor fixes for clean checkout to work.