Fixed build environment issues