Upgrade issues with 6.1.2r3