couple of fixes