Fixed references and Tabify