A little fixes for #111 - CC'ing #95