Fixes for #249