Fixed compile errors for 2.9.0