A few quick fixes for publishing
More fixes for publish form