[HCT-8] #resolve
Fixing license headers, silencing warnings