(Very) Small improvements