AmandaK - fixed export errors