[fix] Several fixes after first run.