Preparations for 0.3.2 bug fix part two