Small fixes overall.