A few warnings snuck in as parameters were added or renamed.
Signed-off-by: NJesse Barnes <jbarnes@virtuousgeek.org>