:memo: Minor tweaks