Some more changes for diferent computer interoperability