Fix locating partial sandbox layers
Improve messages
Fix typo