Fixed some issues from the last commit.