Merge in fixes and additions from the exact branch