Minor FE fixes