Fixes for #33 #34 #35