Changed build files to reflect "default" settings