Fix score bugs