a couple of fixes