Fixed references to other stuff