A couple of fixes.