Fix to-late-initialization of variables