Merge in fixes for building master