couple of fixes
couple of fixes