Fixes for #44