Few cleanup tweaks.