Correct issues with failing build