And now final fixes