Fix up branch in preparation of merge