partial fix of checkouts for CMGTools