3.6 drawer fixes

Fixes #323, #310, #309, #308, #296, #294 and #293.