Fix internal references