Fix bloody typo and other mistake