fixes for contract import