Restore watched items in ascending order; Expand sym links when determining config path; Improve locked database handling