Move the fixopt method into the Build class