Assorted scoring related fixes.