Fixes for 1.1.1 RC
Merge https://github.com/rozumek/BrokerPanel