Warnings reduced. No functional chnage from previous commit.