There were a few attempts to fix the Marvel thing, basically that the Fett mentioned in Marvel was in fact a clone that wound up with Jango's memories and wore similar armor to Boba or something like that.... (and that it was Padme, not Leia who was to be captured)


http://starwars.wikia.com/wiki/Spar