Tweak the build and setup files