Fixed typo-related bugs