misc FE changes