Couple tweaks to make more convenient.