FCM stuff fixed