Minor bugfixes
Broker password is an environment variable