Add new SortGets rewrite rule
Fix makefile