Fix typo and different things