This fixes 2 small problems which was catched during BM05 commissioning.
Closes #60 (closed)
Closes #57 (closed)