Fixed references and resources