Buildable master

Fixes for RT88135 and RT89491