other changes from linux