Changing for linux compatibility
Additional changes for linux compatibility