Reducing the summary  to <=100 chars.
Fixed some build issues.