fixes in recent changes