fixes in maemo and caanoo patches