Manual changes for 1.4