more old fixes