various little fixes