Preparing for hotfix