More warnings fixes from a newer compiler