Preparing for upgrade to 0.5