Fix Hawkeye compile + Fix Hawkeyes Tool not working on latest CB

Title ^