More clarifications for edge cases