Some Lynx commits