Fix general tempadata issues