Addressed a Couple of Edge Cases

-