More publish fixes