Couple cleanup items for testing