Fix compilation issue with latest RAP 2.0 changes