Fixes for publishing