Fixes for #34