Fixes for #37.