Small tweaks to new functionality