Improved validation in MakeFakeInstructions