Small little fixes