Minor clean-up: some warining situations corrected.