Fixed up some of the dependencies and required options