Request: minor improvements