Update to new RFlow and get specs working (poorly)