Fix a couple of bugs

This pull request addresses the following issues:

* Fetch both tokens in XOR
* Add missing break statements