Improve sandboxing