Tweak options to get build script working