few more nan changes