Small little fixes all over the place