Minor findWithTag cleanup