Improvements to configuration scripts