Fixes to comebacks