Pulling in latest fixes from IA fork

Attempting to sync up with IA recent edits.