Minor cleanup/tweaks