Clean warnings

Just enough cleaning to get rid of all those warnings.