Fixes on slaved sub/licences