Fix errors/warnings