completion: a few minor improvements