Fix some small fry