Minor tweaks to avoid recomputing stuff