Implement more of the 1.6.4 patcher

Signed-off-by: Ross Allan <rallanpcl@gmail.com>