Fixed several outdated references