Fixes for scores