More fixes 20130415

Looking at the file diff in github needs the ?w=1 parameter here...