fixes per Richard and Hound