Some fix for your licensing system

Minor stuffs, but kill a big flaw (and an other weird thing, but I'm not sure about it, seems too big (check commit dcc26d7c88)).
Anyway, I'll probably have a look soon =)