More scoring tweaks