Attempted to fix reference issues on other machines. Need to test.