Fixed feature matching module linking problem
Compilation fixes.