Updated build for 2.11