Fixed Mate Panel bugs