Some commpanel fixes