Fix compilation issues for BLC 3.0 GA, bump module version to 2.5