More fixes for lingering graphics issues