Bringing up to GPLv3 requirements