Fix 2 bugs found in the nightly.