Fixed issues with TSD and dependencies.