Calculate component computations correctly