Fixes to match the latest ci cookbook.