Fixed some bugs in Q/drawers