Fixing publish issues