Fixing up some issues around publishing