FMM improvements