Fix some graphical bugs introduced by this hack