Modifications for linux compatibility