Migration fixes for prod