ZK-2458 and ZK-2459

[Flavio Junqueira]

I have submitted two patches to fix the license issues I found. Id' appreciate 
if someone could have a look at them and possibly check them in if LG.

Thanks,
-Flavio