ENH: deal with annoying dataset warnings

A few cosmits ...