Fix out of date refs etc.