Prefix improvements.