Fixes to #1