Fixed apache override problem
Fixed build failing on missing environment variable on initial run