Minor ease of use improvement