Even more final updates