Fixed options to make sure everything is built that is requested, and to eliminate duplication.