Fixes after functional testing

I fix some minor problems after functional testing the software using
Spock.