Bugfix.
And another minor bug fix.