TINKER related improvements