Fix errors - 100% green