Merge "Don't use errno directly"