Address fixes and hex output