Fixing references a bit