Sandbox Plugin: small fixes