Add license headers
Fix broken SQL resulting from a previous merge