Branch2 fixes #3, #4

Bugfix von 2 tickets!