fix "wrong forward reference" warnings
fix "wrong forward reference" warnings

brharrington/atlas,copperlight/atlas,copperlight/atlas,Netflix/atlas,Netflix/atlas,brharrington/atlas,Netflix/atlas,copperlight/atlas,brharrington/atlas