Small fixes in FMM