Fix Compilation Errors

There were a couple function declarations missing, as well as a couple
members in the params struct.
Merge branch 'develop'