Some fixes + slide on make_thunk.