Resolved some reference problems.