Improvements based on DigitalOcean testing