Enable a few more options for the base build