More publish tweaks