Fixed internal references