Preparation for more fixes