Minor Bugs Fixes from Follows*