Patched two issues.

Patched.