Fixed issues introduced in last commit.