fixed issues causing build to fail