Minor cleanup items for developer screen