Fixes to #43 #42