make a couple of fixes