Step # 1: Fix all bad references