Demo day changes for getting things to work.