More work on fix_tabs