Fixes to go with #9