fixes for R5.0 on the integration machine