Fixed issues with build