Fixed link issues