fixs from recent changes.