Some fixup for Start contribution