More changes to remove warnings