More fixes for new version of tintin.