Minor cleanups - eliminated warnings