a couple of fixes.