Fix 2 bugs.