A couple of dependancy ordering fixes.