Fix stage1 build with 6.2.1 (from Andy Gill)