Tamarin source changes and updates