Wunused-params fixes