Proper NA handling; fix R CMD check