Fixed up a couple things according to comments
Oops, premature commit.