7.1 -> 7.3 upgrade problems