Small improvements here and there