Hard code default command mappings
Fix uthash include path