Fixes for #25