Additional changes for linux compatibility