Updated to compile with latest nDPI code

A few changes required to compile with nDPI as of 2013-05-11.