Misc changes not capture in previous commit.