Fix some publishing issues