Fixing Matthias's bugs.

1078