Done some really small fixes still left after the last merge conflict