Fixes from Aspen Chen