Few changes to improve configuration