Added new fixes for lgpl build.