Various fixes (requires db:reset)