fixups & simplifications