Added some more drawing fix-ups.