Last rounds before final fixes