Made minor changes to support JunkDrawer features.