Even more final fixes