Commit: fix bugs

[Dom Lachowicz]

Fix 4391, 4394, and a few others. 4391 was a bad one.

Dom

__________________________________________________
Do you Yahoo!?
Yahoo! Mail Plus - Powerful. Affordable. Sign up now.
http://mailplus.yahoo.com