More Preconditions migrations

And fix a compile error.