Small GPL Fixes