Fixes to new checkout