Up to date init fixes