totoro: patches and fixes