Here is a patch that fixed the problems you mentioned.

Thanks,

-Corey