Fixes for #37