(PDB-663) Some other cleanups

Signed-off-by: Ken Barber <ken@bob.sh>