Fix small conflicts in panel.js