Fixed Issues.

COMMIT, I HATE COMMIT.