Adjust for build and env