Some commpanel fixes
Merge pull request #621 from learning-unlimited/commpanel_fix

Some commpanel fixes