Fixed messages and trashcan errors