Further small changes