Fixed Grad related exports