Changes in preparation for Berlin.js