Merge fixes for #2