Various misc updates