Some warning fixes, unreferenced local variables.