Fixes:

* Rssi tile rebase derp.
* Recent merge rebase derps.