Some minor things I forgot in the end.