Fixes for new publishing/highlight model
Fixes for new publishing/highlight model