Fixed references and docs