Some trivial fixes
Fixed license