And invoice total broke, just save state before these last fixes..