Fixed scoring inconsistencies