Moved some dependencies around to help the generate not fail