Fixed link errors and misalignments