More sane env-specific configuration