More graphics fixes