Fake8 fixups