fix delayed declarations for different exchange types