Use computer mode a few more places.