(PDB-204) Some minor cleanups