Some unused parameters warning fixes