Minor fix and verify publish bugfix