Sync db upgrade with db install to avoid silly upgrade errors