Fixups to panel methods