Fix nullable operations