one-liner fixes and updates