Final decause tweaks