Fixes for #175