Fix errors causing build to fail