Cleaned up several compilation warnings.