More robolectric fixes.