minor code fixups