Few small build tweaks & fixes