Fixes for #37-43