Some build cleanup & few minor components upgrade