Fixes to previous commits, deployment changes, and migration changes