More work on binary patching