Fixed compile errors for 2.9.0
Updating to 2.9.0-2