Justin's migration tweaks to get us up and running