Draw bugfixes