Preparations for fixes