Fixed obsolete references