Minor :bug: fixes and :memo: changes.