Fixing build issues from external introduced with latest rayo commits