Fix potential issues in control panel.