[#844] Tweaks to blocks from new templates