Prepare for some schema changes