rhel: Build fixes