Minor crash fix, test app cosmetic changes