Fixes and typo before 3.8.13