Various updates to thx required for latest version