Small fixes

* Dialyzer
* More expressive match