Count app fixes