Fixed issues with recent commit.