Some more version control fixes.