Make more cross device capable