Core: Few fixes for previous commit.