Cleanup + typo
(cherry picked from commit b31688d)