Some smal updates

/cc #120 for 0c6640993a89aeda670ba50a2d9c08316ff058ba