a little fixes...