various fe fixes