Smaller changes from upstream (mainly license detection), suppress unnecessary warning