Improved settings for dev