Move the call of init-functions to make them work