Fixing compilation problems after upgrade to new version of PicketLink