misc fixes from the last review