More avoiding warnings