Fix missing attributes on panel-related

Fixes RM-2698