Fixes for 9035, 9037, 9052