Correct startup issue + small improvments