Fixed more misplaced reference errors