Some minor fixes around the new fusing behavior :)