Changed build configuration to be more robust and standard.