Fixed some buggs in the Overhead calculation