Minor changes to make it fit in with the 'chipper' build system