Add back FMP and WAILA deps