Changes for Shoebill 1.1