Merge fixes for #12 and part of #23