Improvements and fixes deployment