Fixed minor issues with multiple scores