Fix errors, compiles now