Improvements in messages and restore default path