Fixes for publishable content