Score bug fixes