Fixing some score bugs