[BUG] Fixed some dead store issues