Changes made towards linux build.