Fixes for panel / installation