Fixes for 'attempts' counting