fix up some stuff post merge