a couple more little fixes