Minor cleanup/fixup