Fixing new warnings