Fix branch addresses being incorrect for 32-bit processes
Fix target crash when removing watchpoints
Putting ZG_LOG macro to use