couple of fixes.