Init improvments