Trying to fix a lot of non working references