More updates, partially Mac-specific