Bug fixes and seed data