Performance improvements and bug fixes (FVM)