Adding little fixes...