Fix functiontrait include, add operator