Minor bug fixes to the drawer