Cross platform compatiblity modifications