Couple of tweaks to Writer extended demo program