Small build-related and visual changes