Some final fixes