Satisfy licensing needs in #19