Fixing some score issues