Finial changes prior to 1.8.6