IN | #1069 | Changes to fix the openelis build