Fixing remnants of last commit.