Small technical fixes