Fix mainline protocol for edge cases
Whitespaces