More fixes in accept