additional cross platform changes