Changes that remove compile warnings