Fix errors + cleanup