Handle complex values correctly
Complex numbers fixes