Fix bug in ENW matching
Update makefile to run static analysis