Fixed up references, etc