Clean things up, fix a race