some old fixes