Fixed references and list