Improvements to FM1104 and FM2438