Small improvements

Small improvements