Fixes for better publishing process.