Additional Minor Bugs Fixes From Follows*