(QNX) (Rice) More build fixes