Hot fixes before testing.