Fixed a few mistakes introduced with the previous PR