Cleaned up build  failures