first little fixes