Build fix and small clean-up