Began to fix bad references