Added changes needed for linux