Publishing fixes