More sandbox tweaks