Fixes for #41