fix ups do to inconsistencies in branches