Fixed recent changes in Q/drawers