Fixed some tpr problems