Fixes for lingering graphics issues