Fix comparable

- [ ] This needs some sanity checking