Only some small improvements