changes in None and nan handling