Various refit changes