R4: A few fixups