Draw bugs and quick fixes