Sandbox fixes

See cms-dev/cms#196.