tweaks for more robust handling on datasets without target