Several fixes to scores