Fix errors done this morning and update other includes