Commonise the build