Fixed additional sandbox problems