RT88135 and RT89491 fixes