Minor typo and consistency fixes