Minor tweaks. No new functionality