Manual changes for 1.11