FIx dependency ordering