Small tweaks to the functions.