More user agent fixes contd