Minor fix/cleanups