Result fixes