Fixes for graphical corruption issue (#1490)