Made changes to get hermes working.