lyqyd batch of fixes from last set of changes