Fix RH compilation issues