Additional unused parameter warning fixes