Fixed file references. Release candidate 4