Tweak returned values and handling.