Fixing Eric's bugs.

[permalink] [random]