Fixes for drawPopupMenuItem