Fixed issues stopping build