Fixes for #255 + tests