Couple of FE bugs