Fix assert for CodeAgePatching 1st Instruction and Miscellaneous cleanup