Fixing broken references