Fixed some export issues