Fix some import export issues