Fixed some minor export issues