Tweak messages
Fix matching sandbox layers