minor fixes based on kibit feedback