Fixes for publishable