Z-20 upgrade issues/error