A couple of fixes to remove compile warnings