slight fixups