Minor fixes overall