Fixes for #43