Fixing Jan's bugs.

[permalink] [random]