Fix some tiny things