Fixed issues with build variables.