Fix errors, needed for a pull