Fix some internal references