INTERNAL: minor improvements.