Clean up compile warnings