Updates for 2.11.1 rebuild