Fixing dependency ordering.