Forgot to remove some typo and init fixes