Cleaned up compilation warnings