Small cleanup tweaks