Minor fixes. Added license headers