Fixed some issues with draw/draft recognition