The final fixes