Small changes to resolve warnings