Forget to remove $jrsoftware$ marker on earlier commit. Replaced it with copyright marker.
Fix some warnings on Delphi 2010 (and newer?).