Cleaned up compile warnings