Tiny little fixes