And another attempt at 1.9 fixes

Change-Id: I50286c5820a6d315273815fd9e5328c291ffec06