Fixing environments and database