Fixes for #265