Catch back up with Trunk

Remove compile warnings