Fixes for publishing cycle