Improve fixes for #223