FE minor bug fixes