Add support for additional parameters
Fix warning when compiling in release mode