fix some problems caught by eagle-eyed readers