fix issues with build