Some misc updates