Small tweaks to recent code changes