structuremap fixes