Tweak config and build