More misc updates