Some fixes to make trunk-tracking pass the system test