Improvements but build still fails..