Updated some old bits