Fix excess and missing code