Fixes for #11